Skip to content

nixos/systemd-boot: guard assertion messages against eval failures#320850

Merged
JulienMalka merged 1 commit intoNixOS:masterfrom
philiptaron:systemd-boot-assertions
Jun 18, 2024
Merged

nixos/systemd-boot: guard assertion messages against eval failures#320850
JulienMalka merged 1 commit intoNixOS:masterfrom
philiptaron:systemd-boot-assertions

Conversation

@philiptaron
Copy link
Copy Markdown
Contributor

Description of changes

Guarded assertion messages in nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix against eval failures. These messages should be able to be printed in all cases. In particular, trying to coerce a null to a string is an error unless passed through toString.

I encountered this while testing #313497.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

These messages should be able to be printed in all cases. In particular, trying to coerce a `null` to a string is an error unless passed through `toString`.
@philiptaron philiptaron requested a review from JulienMalka as a code owner June 18, 2024 18:34
@philiptaron philiptaron removed the request for review from JulienMalka June 18, 2024 18:34
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jun 18, 2024
@philiptaron philiptaron requested a review from sdht0 June 18, 2024 18:34
@github-actions github-actions bot added the 8.has: module (update) This PR changes an existing module in `nixos/` label Jun 18, 2024
Copy link
Copy Markdown
Member

@JulienMalka JulienMalka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JulienMalka JulienMalka merged commit 2b62672 into NixOS:master Jun 18, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 18, 2024
@philiptaron philiptaron deleted the systemd-boot-assertions branch June 20, 2024 00:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants